From 43c5ef31281b3b06cc52bec28928e752180413b1 Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Wed, 5 Nov 2008 10:24:30 +0000 Subject: [PATCH] Fix build for win32 and quartz. 2008-11-05 Richard Hult * gtk/gtkstatusicon.c: (gtk_status_icon_set_has_tooltip), (gtk_status_icon_get_tooltip_markup): Fix build for win32 and quartz. svn path=/trunk/; revision=21758 --- ChangeLog | 6 ++++++ gtk/gtkstatusicon.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3afeace691..d2f83694e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-05 Richard Hult + + * gtk/gtkstatusicon.c: (gtk_status_icon_set_has_tooltip), + (gtk_status_icon_get_tooltip_markup): Fix build for win32 and + quartz. + 2008-11-04 Tor Lillqvist Bug 557212 - Problem with which window gains focus and is visible diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c index d88c02442b..280beaaa64 100644 --- a/gtk/gtkstatusicon.c +++ b/gtk/gtkstatusicon.c @@ -2594,11 +2594,11 @@ gtk_status_icon_set_has_tooltip (GtkStatusIcon *status_icon, #endif #ifdef GDK_WINDOWING_WIN32 if (!has_tooltip && priv->tooltip_text) - gtk_tray_icon_set_tooltip_text (status_icon, NULL); + gtk_status_icon_set_tooltip_text (status_icon, NULL); #endif #ifdef GDK_WINDOWING_QUARTZ if (!has_tooltip && priv->tooltip_text) - gtk_tray_icon_set_tooltip_text (status_icon, NULL); + gtk_status_icon_set_tooltip_text (status_icon, NULL); #endif } @@ -2804,11 +2804,11 @@ gtk_status_icon_get_tooltip_markup (GtkStatusIcon *status_icon) #endif #ifdef GDK_WINDOWING_WIN32 if (priv->tooltip_text) - markup = g_markup_escape_text (priv->tooltip_text); + markup = g_markup_escape_text (priv->tooltip_text, -1); #endif #ifdef GDK_WINDOWING_QUARTZ if (priv->tooltip_text) - markup = g_markup_escape_text (priv->tooltip_text); + markup = g_markup_escape_text (priv->tooltip_text, -1); #endif return markup; -- 2.30.2